Conversation
mhsdesign
commented
Jan 29, 2025
| * This layer can be removed if there are no legacy events expected during rebasing | ||
| * @return iterable<EventEnvelope> | ||
| */ | ||
| private function triggerConflictForLegacyEvents(EventStreamInterface $eventStream, bool $dropLegacyEvents): iterable |
Member
Author
There was a problem hiding this comment.
this might not be soo clever after all because this enforced to use of force and later in the code during the forced rebase other changes which were not communicated might also be dropped.
So maybe its just best to silently ignore any CopyNodesRecursively and basically auto drop them for publish, discard and rebase?
We have said for 3 betas that this will happen ...
Member
|
Yep, fine by me |
kitsunet
approved these changes
Feb 20, 2025
While causing a conflict and letting it be solved via force is clever, it might have more negative user side effects: Because of the force flag, any actual conflicts for later changes will be dropped and the user wouldnt know about them because there was just one conflict communicated. Instead of solving this more delicate by merging this conflict with the other possible conflicts we decide to just ignore the CopyNodesRecursively as this was communicated for 3 betas.
1e57565 to
2216a2c
Compare
Member
Author
|
@nezaniel said is fine :D |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
And ignore events when publishing legacy copy nodes -> which could lead to lost content and conflicts in this hierarchy. Please use Neos 9 Beta 18 and before to have the changes published to the base workspace.
Since Neos 9 Beta 16 we advised, to have the legacy nod copy's published to the live workspace.
Also we provide tooling to detect those cases via:
Followup to #5371
Upgrade instructions
Review instructions
Checklist
FEATURE|TASK|BUGFIX!!!and have upgrade-instructions